Merge branch 'refs/heads/master' into gh-pages
Merge branch 'refs/heads/gh-pages'