Update installer template
Merge branch 'master' into tests