[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5 for issue #26664