Further experimenting.
Merge branch 'dev' into gh-pages