Fixed an issue with custom types on Python 3.
Merge branch '2.x-maintenance'