merge 3.6
authorBenjamin Peterson <benjamin@python.org>
Tue, 6 Dec 2016 06:31:20 +0000 (22:31 -0800)
committerBenjamin Peterson <benjamin@python.org>
Tue, 6 Dec 2016 06:31:20 +0000 (22:31 -0800)

Trivial merge