From: Steve Dower <steve.dower@microsoft.com>
Date: Sun, 6 Sep 2015 03:59:41 +0000 (-0700)
Subject: Null merge with 3.4
X-Git-Tag: v3.6.0a1~1661^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faa868aeacb5bfaab116e1de3e4fa906912067e9;p=thirdparty%2FPython%2Fcpython.git

Null merge with 3.4
---

faa868aeacb5bfaab116e1de3e4fa906912067e9