[Python-checkins] cpython (merge 3.6 -> default): Issue 28128: Null merge with 3.6: already applied to default.