Delete with remove
Merge branch 'master' into kingman
django 1.6 compatibility
Merge branch 'master' into kingman