Merge "Allow building with Python 3.x" am: a335367bb0
am: e487732935

* commit 'e487732935e4617c1ca9a0adedbff507ab00c74e':
  Allow building with Python 3.x