this should do it
this should work
Merge branch 'master' into gh-pages