Merge pull request #389 from hnyman/timezone2015d