Pursuing a two-slide solution
Merge branch 'dev' into gh-pages