From: Andrew Kuchling <amk@amk.ca>
Date: Mon, 8 Jun 2015 22:24:46 +0000 (-0400)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a1~2086
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81a612c8598ded483da51ad7c6cee7bf8eaeef19;p=python

Merge from 3.5
---

81a612c8598ded483da51ad7c6cee7bf8eaeef19