Merge branch 'features' into gh-pages