Null merge 3.3 (patch already applied in Python 3.4)