Merge pull request #13243 from etienne02:3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 22 Nov 2018 16:05:14 +0000 (16:05 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 22 Nov 2018 16:05:14 +0000 (16:05 +0000)

Trivial merge