This merge brings cxx-conversion up to rev 187927.

Tested on x8_64.

Reply via email to