Updating the list of plugins
Merge branch 'master' into gh-pages