Fix for test
Eliminate string exception
Ran 2to3.py
Fix division by integer
Ran 2to3.py (reverted from commit 8a2272b363e58b1afabd9269de71aaafb3b84110)
Revert "Ran 2to3.py"

This reverts commit 8a2272b363e58b1afabd9269de71aaafb3b84110.
Merge branch 'Python3'
Version bump to 1.1.5
Merge branch 'dev'
Merge branch 'master'