Don't try to delete nonexistent f
Merge branch 'devel'