From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 25 Nov 2016 17:10:51 +0000 (+0300)
Subject: Merge from 3.6
X-Git-Tag: v3.7.0a1~1878
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1d59af1ef8be4ee458e2631fa8411f3128a07b0;p=python

Merge from 3.6
---

a1d59af1ef8be4ee458e2631fa8411f3128a07b0