This is a fix issue #129. It unfortunately breaks other behavior so the build will fail.
Upgraded six version.
Bumped version.
Merge branch 'master' into release/0.5.0