Merge "Allow building with Python 3.x"