Fixing issue where feeds can't be delete
Merge branch 'develop'