[Python-checkins] cpython (merge 3.6 -> default): merge