From: Ned Deily <nad@python.org>
Date: Mon, 2 Jan 2017 07:50:33 +0000 (-0500)
Subject: merge 3.5
X-Git-Tag: v3.6.1rc1~218
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2eb97231b82510f41092b7569fd8e9c8723543a7;p=python

merge 3.5
---

2eb97231b82510f41092b7569fd8e9c8723543a7