Merge 3.6

This commit is contained in:
Victor Stinner 2016-10-20 00:46:38 +02:00
commit 25a1924758
1 changed files with 4 additions and 4 deletions