Changes plugin name due to conflict. Whoops!
Merge branch 'master' into release