Merge branch 't34_valid_html_css' into t35_custom_css_values