restore gh-pages compatibility
Merge branch 'develop'