Fix typo in doc string.
Merge remote branch 'upstream/master'
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of github.com:metomi/rose into gh-pages