Merge pull request #14223 from alalek:backport_14201
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Apr 2019 14:33:57 +0000 (14:33 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Apr 2019 14:33:57 +0000 (14:33 +0000)

Trivial merge