Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge branch 'develop' into gh-pages
Merge commit 'cfbad30be489fe97c15e5cd5a2f41a32f2e9f55a' into gh-pages

* commit 'cfbad30be489fe97c15e5cd5a2f41a32f2e9f55a':