Changed windows build options
Merge branch 'master' into release
Merge branch 'release' into bin
win32 binary