Support for Python 3.
Merging from origin.