fix for timezone (was a pull req by  allada but into master so I've moved it to develop manually)