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