Rephrase title to something less insane
Merge branch 'master' into gh-pages