Merge pull request #3736 from jmarshallnz/xml_date_time