Merge "Python3 support"