Merge branch 'mingw-file-offset-64' into 'master'