MRG: date time zone + general merge from master

Fixes to datetime and fixed multiline at the same time.

probably needs a few more test cases.