Pulled in Dan's tweaks to date-time namespace for merging ts