Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Replace lorem ipsum text with plugin description