null merge from 3.6
authorNed Deily <nad@python.org>
Wed, 7 Dec 2016 07:02:48 +0000 (02:02 -0500)
committerNed Deily <nad@python.org>
Wed, 7 Dec 2016 07:02:48 +0000 (02:02 -0500)

Trivial merge