From: Senthil Kumaran <senthil@uthcode.com>
Date: Sat, 6 Feb 2016 03:37:47 +0000 (-0800)
Subject: merge from 3.5
X-Git-Tag: v3.6.0a1~647
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=029f7f7af2d23e34ae875489426185ce75c0e121;p=python

merge from 3.5
---

029f7f7af2d23e34ae875489426185ce75c0e121