From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 16 Jan 2017 08:05:47 +0000 (-0800)
Subject: merge 3.5
X-Git-Tag: v3.6.1rc1~167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=741c45adabc23c65ea85ff817c3266665ccf76e1;p=python

merge 3.5
---

741c45adabc23c65ea85ff817c3266665ccf76e1