Merge 3.6
authorVictor Stinner <victor.stinner@gmail.com>
Tue, 22 Nov 2016 14:30:53 +0000 (15:30 +0100)
committerVictor Stinner <victor.stinner@gmail.com>
Tue, 22 Nov 2016 14:30:53 +0000 (15:30 +0100)

Trivial merge