From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 6 Oct 2016 06:29:16 +0000 (-0700)
Subject: merge 3.5
X-Git-Tag: v3.6.0b2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43441c77b5fd9617d7baff1cf3bbc072fef6035b;p=python

merge 3.5
---

43441c77b5fd9617d7baff1cf3bbc072fef6035b