From: Yury Selivanov <yury@magic.io>
Date: Thu, 15 Sep 2016 17:50:28 +0000 (-0400)
Subject: Merge 3.6 (after null merge with 3.5)
X-Git-Tag: v3.7.0a1~2479
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44f05608d3df3a0d67d21a117d917e2791ea5a7f;p=thirdparty%2FPython%2Fcpython.git

Merge 3.6 (after null merge with 3.5)
---

44f05608d3df3a0d67d21a117d917e2791ea5a7f