Update for git changes.
Add a patch for python-3 support.