Merge pull request #11722 from gnthibault:3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 8 Jun 2018 12:59:19 +0000 (12:59 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 8 Jun 2018 12:59:19 +0000 (12:59 +0000)

Trivial merge