Message 311718 - Python tracker

If the fix will land into 3.6 bugfix release only -- I can live with it, while the overall looks tricky.

Ned Deily, what do you think about?