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