Merge branch 'master' of https://github.com/alex85k/winbuilds