Fix date and time fields
Merge branch 'master' into 2.5