Merge pull request #441 from hnyman/tz2015f