Remove broken plugin
Merge branch 'develop'