Merge "Consistency tweaks: xml -> XML, Href -> href"