prevent trying to copy / if for some reason something goes wrong
Merge remote-tracking branch 'origin/development' into bleeding-edge