Update script
Merge branch 'master' into work-desktop
Fix paths
Merge branch 'master' into work-desktop