Merge pull request #14194 from alalek:backport_14193
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 1 Apr 2019 14:03:13 +0000 (14:03 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 1 Apr 2019 14:03:13 +0000 (14:03 +0000)

Trivial merge