Respect users time of day format, fixes #329
Merge branch 'master' into builds
7.781