Merge branch 'refs/heads/master' into gh-pages
Merge remote-tracking branch 'refs/remotes/origin/gh-pages'