Merge branch 'master' into static-pages
Improve page titles to helper.
Merge branch 'static-pages'