Update installation script for world
Merge branch 'master' into work-desktop