Merge branch 'dev' into gh-pages