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