Fixed a build issue in clang
Merge branch 'master' into meshupload
Merge remote-tracking branch 'Aleric/meshupload' into meshupload
Merge remote-tracking branch 'Lirusaito/meshupload' into meshupload
Build fixes