Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
add entry per https://twitter.com/patrickhamann/status/401342734344417281
Merge branch 'gh-pages'