Merge branch 'refs/heads/master' into gh-pages
Merge branch 'gh-pages' of https://github.com/justinviger/echo into gh-pages