From: Steve Dower <steve.dower@microsoft.com>
Date: Sun, 18 Sep 2016 00:30:05 +0000 (-0700)
Subject: Null merge from 3.6
X-Git-Tag: v3.7.0a1~2447
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=126c5be33fb9eae8578ab79f02288d7c76f877b4;p=thirdparty%2FPython%2Fcpython.git

Null merge from 3.6
---

126c5be33fb9eae8578ab79f02288d7c76f877b4