Better deprecation messages indicating when the deprecated item will be removed.
Automatic Py3k merge for testing