Merge branch 'develop' of git://github.com/ericschultz/wix3 into develop
Merge branch 'develop' of https://github.com/wixtoolset/wix3 into develop
Merge branch 'develop' of https://github.com/wixtoolset/wix3 into develop