Merge pull request #15848 from alalek:backport_test_15842
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 7 Nov 2019 16:48:41 +0000 (16:48 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 7 Nov 2019 16:48:41 +0000 (16:48 +0000)

Trivial merge