Merge pull request #14382 from alalek:backport_14373
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 22 Apr 2019 15:52:10 +0000 (15:52 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 22 Apr 2019 15:52:10 +0000 (15:52 +0000)

Trivial merge