linux 32 cpp build
Merge branch 'master' into linux32