Merge pull request #12326 from alalek:issue_12325
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 28 Aug 2018 12:51:33 +0000 (12:51 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 28 Aug 2018 12:51:33 +0000 (12:51 +0000)

Trivial merge