Upgraded six to the latest version.
Merge branch 'master' into feature/six-1.4.1
Merge pull request #123 from nose-devs/feature/six-1.4.1

Updated six to version 1.4.1