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