Merge pull request #5260 from totten/4.5-test-tz2