Merge branch 'CNAME' into gh-pages
Merge branch 'gh-pages' into CNAME