[cxx-conversion] Merge from trunk

[Diego Novillo]

I've just merged cxx-conversion up to rev 187449.

Diego.