[Python-checkins] cpython (merge 3.6 -> default): Issue #29283: Merge from 3.6