Switch back to using scp
Merge branch 'master' into devel_cloud_repository