[c++-concepts] merge from trunk

[Gabriel Dos Reis]

at revision 202396.  No conflict.

-- Gaby