Merge 3.6
authorVictor Stinner <victor.stinner@gmail.com>
Thu, 15 Dec 2016 15:22:19 +0000 (16:22 +0100)
committerVictor Stinner <victor.stinner@gmail.com>
Thu, 15 Dec 2016 15:22:19 +0000 (16:22 +0100)

Trivial merge