Merge "Python 3 compatibility."