Fixed typo found by Claire
Merge branch 'master' into gh-pages