Merge Brendan's Jun 18 commits into gh-pages