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

Merge.
---

f962473149b86292aa0c70772367a37749cd6aac