From: Brett Cannon <brett@python.org>
Date: Fri, 24 Jun 2016 19:23:23 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a3~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=620d9c7200b54836c708d82e3b09c04152e836fc;p=python

Merge from 3.5
---

620d9c7200b54836c708d82e3b09c04152e836fc