Merge pull request #14234 from alalek:backport_14203
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Apr 2019 16:34:41 +0000 (16:34 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Apr 2019 16:34:41 +0000 (16:34 +0000)

Trivial merge