From: Ned Deily <nad@python.org>
Date: Mon, 2 Jan 2017 07:48:26 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.3~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8134afd8e331f364378a5f6d03830a3c2094074;p=python

merge 3.4
---

e8134afd8e331f364378a5f6d03830a3c2094074