From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 1 Jan 2016 17:13:16 +0000 (-0600)
Subject: merge 3.5
X-Git-Tag: v3.6.0a1~834
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa1ef1e5250d51918671e3e6f247c32bdd3dc4af;p=python

merge 3.5
---

fa1ef1e5250d51918671e3e6f247c32bdd3dc4af