Issue #26940: Merge 3.6.
authorXavier de Gaye <xdegaye@users.sourceforge.net>
Thu, 8 Dec 2016 10:27:27 +0000 (11:27 +0100)
committerXavier de Gaye <xdegaye@users.sourceforge.net>
Thu, 8 Dec 2016 10:27:27 +0000 (11:27 +0100)

Trivial merge