Merge https://github.com/firegiant/wix3 into develop
Merge branch 'develop' of https://github.com/wixtoolset/wix3 into develop
Merge branch '4598' of git://github.com/rseanhall/wix3 into develop
Merge branch 'develop' of https://github.com/wixtoolset/wix3 into develop
Merge branch 'httpVotive' of git://github.com/rseanhall/wix3 into develop
Fix bug in mbapreq where it wouldn't reload the bootstrapper if there was a mix of installed and uninstalled prerequisites.
Merge branch 'develop' of https://github.com/wixtoolset/wix3 into develop
Merge branch 'WIXBUG4594' of git://github.com/jchoover/wix3 into develop
Merge branch 'develop' of https://github.com/wixtoolset/wix3 into develop
Merge branch 'bug4608' of git://github.com/rseanhall/wix3 into develop

Conflicts:
	History.md