Preparing for installer support.
Merge branch 'master' of https://github.com/Burton-Radons/Alexandria