Bug ZK-2152: Wrong Behaviour of Datebox when Overwriting Time
Merge pull request #71 from jerrywell/6.5

Bug ZK-2152: Wrong Behaviour of Datebox when Overwriting Time
Merge remote-tracking branch 'upstream/6.5'