6/9 accordion fix
Merge branch 'master' into gh-pages