From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 26 Sep 2015 07:09:39 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~1440
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b8854eee0d81fdc56e38a1356fd4a0972d231bc;p=python

merge 3.5
---

5b8854eee0d81fdc56e38a1356fd4a0972d231bc