Follow new installer
Merge branch 'refs/heads/installer'
Merge branch 'refs/heads/master' into alpha