Fix to enable Python 3 support.
Merge remote-tracking branch 'remotes/origin/master'