avoid rsync creating nested copies
Merge remote-tracking branch 'origin/development' into bleeding-edge
Merge remote-tracking branch 'origin/bleeding-edge'