Merge with bugfix-0.5
debian/pycompat
1 2