Fix for Python 3
Merge branch '0.9-maintenance'