merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Sun, 27 Sep 2015 08:23:35 +0000 (01:23 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sun, 27 Sep 2015 08:23:35 +0000 (01:23 -0700)

Trivial merge