merge in upsteam cm-11.0 changes

gcc 4.8 fixes