Update installer template
Merge branch 'master' into tests
Merge branch 'master' into i18n-fix