From: Yury Selivanov <yselivanov@sprymix.com>
Date: Thu, 14 May 2015 22:33:14 +0000 (-0400)
Subject: Merge
X-Git-Tag: v3.5.0b1~133
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b4046f062760a26d7668b0f56ae34adf6cfcf2d;p=python

Merge
---

6b4046f062760a26d7668b0f56ae34adf6cfcf2d