Copy files if they can't be moved.
Merge remote-tracking branch 'pistachitos/development' into development