From: Łukasz Langa <lukasz@langa.pl>
Date: Sun, 12 Jun 2016 01:07:28 +0000 (-0700)
Subject: merge heads
X-Git-Tag: v3.6.0a2~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f62d38cf8ea8b2587de278aa99a2a4b0a8d984c;p=python

merge heads
---

4f62d38cf8ea8b2587de278aa99a2a4b0a8d984c