Fix the ability to delete/rename files on assignments
Merge remote-tracking branch 'origin/master' into rails4