Fixing typo
Merge branch 'timezone_fix' into string_attributes_and_timezone_fix