From: Yury Selivanov <yury@magic.io>
Date: Thu, 15 Sep 2016 17:26:58 +0000 (-0400)
Subject: Merge heads
X-Git-Tag: v3.6.0b2~207
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03179ef3a827704eab183c0db38e8ca0bf3e9f1c;p=python

Merge heads
---

03179ef3a827704eab183c0db38e8ca0bf3e9f1c