'theme by' > 'based on a theme by'
Merge branch 'master' into gh-pages
Rebuild.