RC2 fixes for index page.
Merge branch 'master' into gh-pages