Typo found by Asher
Merge branch 'master' into gh-pages