Merge pull request #13043 from alalek:compatibility_12623
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 7 Nov 2018 20:54:40 +0000 (20:54 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 7 Nov 2018 20:54:40 +0000 (20:54 +0000)

Trivial merge