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

[steve.dower]

https://hg.python.org/cpython/rev/68f1d424a9a5
changeset:   98185:68f1d424a9a5
branch:      3.5
parent:      98182:fa869ccf9368
parent:      98184:2f57270374f7
user:        Steve Dower <steve.dower at microsoft.com>
date:        Tue Sep 22 17:30:28 2015 -0700
summary:
  Merge from 3.4

files:



-- 
Repository URL: https://hg.python.org/cpython