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