minor
content hide/show
Merge branch 'master' into gh-pages