Commit for test
Merge branch 'master' into gh-pages
Update index.html by checking out from master

Weirdly, the usual command
git merge -X theirs -X subtree=doc/html master
does not work anymore...