Imported Debian patch 3.1.10-2
Merge tag 'debian/3.1.10-2'

Debian release 3.1.10-2
Disable Python 3 support