Merge branch 'master' into changing-hgroup

Conflicts:
ccc.html