Merge branch 'master' into gh-pages
edit story
Merge branch 'gh-pages'