Fix HTML meta and title
Merge branch 'master' into gh-pages