Master pytz

Port of #1061 to master