Better error message if dropping files fails
Merge remote-tracking branch 'origin/dev' into dev