Merge 3.6
authorVictor Stinner <victor.stinner@gmail.com>
Wed, 21 Sep 2016 07:16:39 +0000 (09:16 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Wed, 21 Sep 2016 07:16:39 +0000 (09:16 +0200)

Trivial merge