Further work on installers.
Merge remote-tracking branch 'origin/next' into installer

Conflicts:
	CMakeLists.txt