don't use UTC, ughhhhhhhhhhhhhhhh
Merge branch 's-hist' into staging2