[Python-checkins] cpython (merge 3.2 -> default): #12531: merge with 3.2.