Merging latest changes on master into gh-pages

Trying to keep gh-pages up to date in the run-up to #759.