Merge pull request #316 from hnyman/timezone-2015a