merge 3.5 (#27093)
authorBenjamin Peterson <benjamin@python.org>
Tue, 24 May 2016 05:48:05 +0000 (22:48 -0700)
committerBenjamin Peterson <benjamin@python.org>
Tue, 24 May 2016 05:48:05 +0000 (22:48 -0700)

Trivial merge