Merge branch 'master' into kyle
Change to name of plugin.
Merge branch 'kyle'