From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 5 Sep 2016 17:17:22 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.6.0b1~247^2~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80109d3351d2d1758caa2ff37bc4b69cc91a2fbe;p=python

merge heads
---

80109d3351d2d1758caa2ff37bc4b69cc91a2fbe