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

[ned.deily]

https://hg.python.org/cpython/rev/04f096b3ac9c
changeset:   105500:04f096b3ac9c
parent:      105498:04c6e0319c30
parent:      105499:a8abec9182ea
user:        Ned Deily <nad at python.org>
date:        Wed Dec 07 02:02:48 2016 -0500
summary:
  null merge from 3.6

files:



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