Merge branch 'master' into Installer
Merge branch 'Installer'