try 2
win
Merge branch 'master' into gh-pages