Merge branch 'testing' into gh-pages
Merge branch 'testing' into gh-pages