index.html changes.
Merge remote-tracking branch 'upstream/combine' into gh-pages