Merge pull request #14726 from alalek:backport_14716
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 5 Jun 2019 15:54:45 +0000 (15:54 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 5 Jun 2019 15:54:46 +0000 (15:54 +0000)

Trivial merge