Merge branch '42cc' into t35_custom_css_values