Message 131902 - Python tracker

Fixed in 'default' branch.  Note that the regression still exists in 3.2;  I'm not sure that it's worth backporting the two fixes.