really really fix timezone issues (with tests)
Merge remote-tracking branch 'origin/v0.3.0-dev' into v0.3.0-dev