Fixes issue with time difference display.
Merges master into production branch