Merge branch 'group_html_in_html5tv'