merge 3.6
authorBenjamin Peterson <benjamin@python.org>
Mon, 19 Sep 2016 02:25:00 +0000 (19:25 -0700)
committerBenjamin Peterson <benjamin@python.org>
Mon, 19 Sep 2016 02:25:00 +0000 (19:25 -0700)

Trivial merge