Xml content-type matching less restrictive
Merge remote-tracking branch 'origin/master'