Pointing at the staging deps
Merge branch 'master' into topic
Merge branch 'master' into topic
Merge branch 'master' into topic
Fixing file manager so that it doesn't delete files on termination!