I think this JavaScript thing might actually catch on.
Merge branch 'master' into gh-pages