Fix build on 32 bit targets, a regression from f53e1fc8c8f87244c22d332031aa232e99a768bb
Merge remote-tracking branch 'upstream/master' into optimize_gcc