[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

Trunk was merged into the c++-concept branch as of revision 198506.

-- Gaby