Getting going on this project again.
Merge branch 'master' into gh-pages