[c++-concepts] merge from trunk

[Gabriel Dos Reis]

Trunk was merged into c++-concepts branch at revision 198984.

-- Gaby