Fix crash with steam on win64
Merge branch 'master' into steam-stable