update master build
Merge branch 'master' of github.com:jcupitt/build-win32