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