[Python-checkins] cpython (merge 3.4 -> 3.4): merge