Merge branch 'master' into gh-pages
killed cname
Merge branch 'gh-pages'