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

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