Better timestamp

Merged Martin Bergemann requested to merge better_timestamp into master

Merge request reports