From: Larry Hastings <larry@hastings.org>
Date: Mon, 7 Sep 2015 12:16:38 +0000 (-0700)
Subject: Merge heads.
X-Git-Tag: v3.5.1rc1~427
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8c47f55e636ed86791160944ccbb1ea651476bd;p=python

Merge heads.
---

c8c47f55e636ed86791160944ccbb1ea651476bd