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

merge heads
---

eb62be12f05cfce17f09709b4340a8a24dd0a1b5