From: Barry Warsaw <barry@python.org>
Date: Wed, 8 Jun 2016 21:56:13 +0000 (-0400)
Subject: Null merge.
X-Git-Tag: v3.6.0a2~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47791df97cb36d5abf4ef7e465e7e654690f1cbd;p=python

Null merge.
---

47791df97cb36d5abf4ef7e465e7e654690f1cbd