Merge branch 'fixtimestampdisplay' into gh-pages