Hackish MSI installer
Merge branch 'installer'