Merge proposals

pytz-deprecation-shim in Ubuntu has no merge proposals.