Merge "Remove redundant 'type' attributes from style and script tags"