Merge branch 'reduceWatchers' into gh-pages
Merge branch 'scrolling' into gh-pages
Merge branch 'fixtimestampdisplay' into gh-pages