From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 21 Aug 2016 07:43:58 +0000 (+1000)
Subject: Merge #27782 fix from 3.5
X-Git-Tag: v3.6.0b1~618
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbcd221de4f13a855ba37d48a238895e4ddc92f4;p=python

Merge #27782 fix from 3.5
---

cbcd221de4f13a855ba37d48a238895e4ddc92f4