Fix compiling with 32bit MinGW
-next
Merge remote-tracking branch 'upstream/master' into null