From: Larry Hastings <larry@hastings.org>
Date: Mon, 24 Aug 2015 20:00:14 +0000 (-0700)
Subject: Null merge from 3.5.
X-Git-Tag: v3.6.0a1~1742
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8172c07f616b7779e968cf3fbfa4d0fc11e1922f;p=thirdparty%2FPython%2Fcpython.git

Null merge from 3.5.
---

8172c07f616b7779e968cf3fbfa4d0fc11e1922f