[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

The trunk was merged into the c++-concepts branch as of revision 197225.

-- Gaby