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