Changed the merge back to six away from sys.version
Merge branch 'hotfix/0.90.1.2'