From: Guido van Rossum <guido@dropbox.com>
Date: Fri, 4 Sep 2015 19:55:13 +0000 (-0700)
Subject: Null merge (3.5.1 -> default).
X-Git-Tag: v3.6.0a1~1668
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19bbb9af678040e8963edfcfdc30e9f87b106fb9;p=python

Null merge (3.5.1 -> default).
---

19bbb9af678040e8963edfcfdc30e9f87b106fb9