Workaround for http://bugs.python.org/issue2128
Merge pull request #50 from Toilal/python2128_workaround

Workaround for http://bugs.python.org/issue2128