Merge "Update hacking for Python3"