From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 1 Feb 2017 07:31:10 +0000 (-0800)
Subject: merge 3.5 (#29398)
X-Git-Tag: v3.6.1rc1~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b3f4c1efba963e76161445904e3a43ff8777395;p=python

merge 3.5 (#29398)
---

2b3f4c1efba963e76161445904e3a43ff8777395