Fixed time zone issue
Merge branch '2.0'