From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 14 Nov 2015 08:11:19 +0000 (-0800)
Subject: merge 3.5 (#25569)
X-Git-Tag: v3.6.0a1~1062
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=449e7c1b06c6d6cafd515d87e91e12e1407e59c9;p=python

merge 3.5 (#25569)
---

449e7c1b06c6d6cafd515d87e91e12e1407e59c9