From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 16 Jul 2016 23:13:51 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0a4~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb2125daf35f7f21d04b5c567c639c20b0565a9c;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

fb2125daf35f7f21d04b5c567c639c20b0565a9c