Handle deployment path's ownership properly
Merge branch 'master' into develop
Bump version number to 0.9.20
Merge branch 'release/0.9.20' into develop