From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 23 Mar 2016 17:40:14 +0000 (-0400)
Subject: Merge heads
X-Git-Tag: v3.6.0a1~368
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0217ab660141977b7d8fd7bbfc847e6186fbf62;p=python

Merge heads
---

d0217ab660141977b7d8fd7bbfc847e6186fbf62