From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Sat, 30 May 2015 18:55:22 +0000 (-0600)
Subject: Merge from 3.5.
X-Git-Tag: v3.6.0a1~2150
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a3414c20118743347bcabb6c8d3fe5ee75cd0fa;p=python

Merge from 3.5.
---

7a3414c20118743347bcabb6c8d3fe5ee75cd0fa