From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 16 Nov 2015 05:57:50 +0000 (-0800)
Subject: merge 3.5 (#25630)
X-Git-Tag: v3.6.0a1~1052
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d798dc1034c29bc31f7d7be8a84335e67921fe13;p=python

merge 3.5 (#25630)
---

d798dc1034c29bc31f7d7be8a84335e67921fe13