[Python-checkins] cpython (merge 3.3 -> default): #16518: merge with 3.3.