* Merge with Debian; remaining changes: - Keep the preliminary python3 support, but don't enable it. - Try to use plain pygtkcompat and fall back to gi.pygtkcompat, to avoid a DeprecationWarning, and a crash. - Use new io_add_watch api on new versions of pygobject.