From: Steve Dower <steve.dower@microsoft.com>
Date: Sat, 7 Nov 2015 18:08:53 +0000 (-0800)
Subject: Null merge from 3.4
X-Git-Tag: v3.6.0a1~1103
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51acec60088c33bf36d4fe7549e718c9fde222e0;p=thirdparty%2FPython%2Fcpython.git

Null merge from 3.4
---

51acec60088c33bf36d4fe7549e718c9fde222e0