Merge "Generate valid HTML code on error pages"