From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 2 Jan 2017 04:30:26 +0000 (-0600)
Subject: merge 3.5 (#29057)
X-Git-Tag: v3.6.1rc1~220
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46322587ecb725c99211c3365a7ba2cbfc574403;p=python

merge 3.5 (#29057)
---

46322587ecb725c99211c3365a7ba2cbfc574403