FIX: allow localization in timestamp
Merge pull request #2709 from techAPJ/patch-2

FIX: allow localization in timestamp