Prepare for installer
Forgot a setting...
Merge branch 'master' into Template-test