Installer update
Merge pull request #830 from solispauwels/master

Installer update