Issue #28324: Merge from 3.6
authorNed Deily <nad@python.org>
Sun, 2 Oct 2016 01:33:34 +0000 (21:33 -0400)
committerNed Deily <nad@python.org>
Sun, 2 Oct 2016 01:33:34 +0000 (21:33 -0400)

Trivial merge