From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 8 Jan 2016 05:38:51 +0000 (-0800)
Subject: merge 3.5 (closes #25672)
X-Git-Tag: v3.6.0a1~813
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5db60aa84ea55b7b5623327551d41d51ea22c528;p=python

merge 3.5 (closes #25672)
---

5db60aa84ea55b7b5623327551d41d51ea22c528