From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Jan 2017 04:09:23 +0000 (-0600)
Subject: merge 3.5
X-Git-Tag: v3.6.1rc1~221
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51b45a1093e8820ceb3dc04619d62c2e15873302;p=python

merge 3.5
---

51b45a1093e8820ceb3dc04619d62c2e15873302