From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 17 Nov 2016 00:35:53 +0000 (-0800)
Subject: Null merge from 3.6
X-Git-Tag: v3.7.0a1~1967
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb9d10fecb018c6a9551524e583a989cfcb68b9c;p=thirdparty%2FPython%2Fcpython.git

Null merge from 3.6
---

cb9d10fecb018c6a9551524e583a989cfcb68b9c