utc on csv export as well
Merge branch 'timestamp-fix' into testing