[Python-checkins] cpython (merge 3.3 -> default): merge for issue #20778