From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 27 Sep 2015 08:23:40 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~1427
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=feb8b6284712cdbf28f8f41ee6386b0a54ec13f4;p=python

merge 3.5
---

feb8b6284712cdbf28f8f41ee6386b0a54ec13f4