[Python-checkins] cpython (merge 3.5 -> default): Merge w/ 3.5 for issue #26587

[brett.cannon]

https://hg.python.org/cpython/rev/94d5c57ee835
changeset:   100877:94d5c57ee835
parent:      100875:bd1af1a97c2e
parent:      100876:09dc97edf454
user:        Brett Cannon <brett at python.org>
date:        Fri Apr 08 15:08:01 2016 -0700
summary:
  Merge w/ 3.5 for issue #26587

files:



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