Merge branch 'gh-pages.develop' into gh-pages