Changed windows build options
Merge branch 'master' into release