[c++-concepts] merge from trunk

[Gabriel Dos Reis]

At revision 200282.

Andrew -- 
there was a slight conflict with the new usage of is_binary_trait.
I think I resolved it properly, but double check.

-- Gaby