This is sans Python 3, the rest should be fine. Rebase many patches, port others, courtesy of Denis Arnaud.
Petr Machata