From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 5 Sep 2016 17:17:30 +0000 (-0700)
Subject: merge heads
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=177a42438d9ab8e8b261f6dc7efb10b1c401d710;p=python

merge heads
---

177a42438d9ab8e8b261f6dc7efb10b1c401d710