match updatemerge merges time_string. fixes #454
Merge remote-tracking branch 'upstream/master' into mms