fixed an issue where the folder path was not made when using rsync
Merge branch 'development' into bleeding-edge
Merge remote-tracking branch 'origin/bleeding-edge'