Timestamp were incorrectly translated.
Merge branch 'dev'