Merge pull request #13323 from alalek:issue_13297
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 29 Nov 2018 12:40:02 +0000 (12:40 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 29 Nov 2018 12:40:03 +0000 (12:40 +0000)

Trivial merge