From: Larry Hastings <larry@hastings.org>
Date: Mon, 24 Aug 2015 19:58:57 +0000 (-0700)
Subject: Merge.
X-Git-Tag: v3.6.0a1~1742^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f51fd7bc1a2bafabdebc58c95faaac10dc1abc39;p=python

Merge.
---

f51fd7bc1a2bafabdebc58c95faaac10dc1abc39