Add fix for Python Issue 15881 in <2.7.6,<3.2