Merge branch 'origin/master'
Merge branch 'origin/gh-pages'