From: INADA Naoki <songofacandy@gmail.com>
Date: Wed, 7 Dec 2016 09:38:15 +0000 (+0900)
Subject: null merge from 3.6
X-Git-Tag: v3.7.0a1~1818
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09e4a695d17f35375d3a2298ef78fae0e27af8ce;p=python

null merge from 3.6
---

09e4a695d17f35375d3a2298ef78fae0e27af8ce