Null merge from 3.6
authorNed Deily <nad@python.org>
Sat, 17 Dec 2016 03:56:48 +0000 (22:56 -0500)
committerNed Deily <nad@python.org>
Sat, 17 Dec 2016 03:56:48 +0000 (22:56 -0500)

Trivial merge