Merge remote branch 'upstream/master' into gh-pages
Merge branch 'gh-pages' of github.com:metomi/rose into gh-pages