Merge branch 'phil-assorted' into gh-pages