Get rid of timezonekiller
Merge branch 'master' into develop