[c++-concepts] Merge from trunk

[Gabriel Dos Reis]

trunk was merged into c++-concepts branch at revision 201560.
I resolved some conflicts in cp caused by recent merges and ongoing work
on trunk.

-- Gaby