rolling back, trying CNAME again
Merge branch 'master' into gh-pages