http://github.com/ -> https://github.com/
Merge branch 'develop' into gh-pages