Merge remote-tracking branch 'cm/cm-10.1' into db42
this seems to work better
make sure build uses gcc 4.7