Condition tidy
Added parameter for time/zone
Merge branch 'timezone-support' into devel

* timezone-support:
  Added parameter for time/zone