Merge pull request #678 from dzeller/installer

Installer
Merge branch 'master' into abstract_roleswitch
further cleanup