Add support for new github.io domain
Merge branch 'master' into gh-pages