Merge pull request #15322 from alalek:backport_15318
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 16 Aug 2019 15:40:21 +0000 (15:40 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 16 Aug 2019 15:40:22 +0000 (15:40 +0000)
commitb8f35aa1093f4a0ffeaf0fc7824eeec038ab96b7
treec9e427e10ab2c0da914f3b10f4ea60b8c6af86a6
parent7df3141bbca64da5c0d4e508200488cb1f3e8a4e
parentfcc7d8dd4edf40ac864861668da7ffcbe11e2f98
Merge pull request #15322 from alalek:backport_15318