Fix for Time zone issues #5
Merge branch '13.0-Gotham-pivos' into 13.1-Gotham-pivos