Instructions almost finished.
Merge remote-tracking branch 'origin/master' into launcher_tweakings