One of these times, I’ll manange to remove all references to the prior version in time for a release.
Merge branch 'master' into gh-pages