Created originally on Bitbucket by marky1991 (Mark Young)
Was already merged in Bitbucket before import, marked as merged by the import user
I'm not really sure about the change in inspect.py, but it's replacing something which fails completely on pypy. Feedback on that change would be especially appreciated.