Merge remote-tracking branch 'origin/master' into msi
Merge branch 'msi' of https://github.com/thoemmi/Solutionizer into msi
Merge branch 'msi' of https://github.com/thoemmi/Solutionizer into msi