Accept another format for timestamps.
Merge branch 'development' into rdz