Merge branch 'master' into gh-pages
don’t forget to escape backslashes in your regex, kids!
Merge branch 'gh-pages'