Merge branch 'master' into gh-pages

The correct way around this time.