convert timestamps to UTC+-0 (critical fix)
Merge remote-tracking branch 'origin/master' into simple