From: Berker Peksag <berker.peksag@gmail.com>
Date: Thu, 2 Jun 2016 01:26:50 +0000 (-0700)
Subject: Issue #12243: Merge from 3.5
X-Git-Tag: v3.6.0a2~189
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa6de5cddf9cd2029b7c2a0fe8b4c5ef27a1273e;p=python

Issue #12243: Merge from 3.5
---

fa6de5cddf9cd2029b7c2a0fe8b4c5ef27a1273e