Merge pull request #361 from hnyman/timezone2015c