From: Berker Peksag <berker.peksag@gmail.com>
Date: Wed, 1 Jun 2016 16:36:40 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a2~193
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12a8a8a0dba3f8f1e26240882701fa7d3e2e4151;p=python

Merge from 3.5
---

12a8a8a0dba3f8f1e26240882701fa7d3e2e4151