Message 272800 - Python tracker

I have manually "rebased" the patch taking into account that part of the work has been done in http://bugs.python.org/issue25987

Serhiy, Martin could you please review the latest patch and check that everything is OK?

Andrew did a really good job and I would like this to land in 3.6