Fixes #1025 (NaN in history tab)
Merge pull request #1107 from sublimator/develop

Fixes #1025 (NaN in history tab)