Merge "update html DOCTYPE sent by HttpError exception"