From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 7 Jul 2016 06:28:19 +0000 (-0700)
Subject: merge 3.5 (#27248)
X-Git-Tag: v3.6.0a3~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c13d85bf8d769bba49c737c326b483b257a997b0;p=python

merge 3.5 (#27248)

Patch from Xiang Zhang.
---

c13d85bf8d769bba49c737c326b483b257a997b0