Make 1.5.1 build Python3 compatible
Merge pull request #826 from anatol/next

Make 1.5.1 build Python3 compatible