fixed history timestamps
Merge branch 'master' into feature