The fix of r19727 was extended to Python versions 2.6 and lower as well.
Authored by: bugman 2013-05-24
Parent: [r19727]
Child: [r19729]
