Merge branch 'bb/t0006-negative-tz-offset'