Change URI to github.io URI.
Merge branch 'master' into gh-pages