[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5