6/9 container header index page fix
Merge branch 'master' into gh-pages