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)
commit51631b90afb222d6d79b6d9d9615cf145b3a676a
treeaeb89e7dea2e90c5a8a59dade4d2e60db7a5ded2
parent3efd2df87fb9048c8623d2a777c0b6a26c509be1
parenta2445c44cb576b376eb64fe31319fefdbaba8f12
Merge pull request #14726 from alalek:backport_14716