Don't cd into nonexistent data directory
Merge branch 'fix-deploy' into develop