fix grammar, thanks to pellaeon
Merge branch 'master' into gh-pages