Commit so can pull onto another machine.
Fix possible error with time parsing.
Merge branch 'fix-time-validation-54300220' into develop