From: Yury Selivanov <yury@magic.io>
Date: Thu, 15 Sep 2016 17:37:39 +0000 (-0400)
Subject: Merge heads (3.6/default)
X-Git-Tag: v3.7.0a1~2481
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03a29a80bee20f92036fde5d791156a920fe557e;p=thirdparty%2FPython%2Fcpython.git

Merge heads (3.6/default)
---

03a29a80bee20f92036fde5d791156a920fe557e