Merge branch 'gh-pages'
page titles, only matters for my own sanity, I guess.
Merge branch 'master' into gh-pages