32 bit linux build changes
Merge branch 'linux-32bit' into develop