From: Gregory P. Smith <greg@krypto.org>
Date: Fri, 15 Apr 2016 23:47:32 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.6.0a1~198
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0c6380640b5e3fb4ba6755121f25ea333f175c9;p=python

merge heads
---

b0c6380640b5e3fb4ba6755121f25ea333f175c9