Yet another work around to work with Python 3.
Merge branch 'patch-1'