Fix regression on 32bit (windows) systems
Merge branch 'master' into develop