Merge pull request #10914 from alalek:issue_10815
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 21 Feb 2018 18:26:15 +0000 (18:26 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 21 Feb 2018 18:26:15 +0000 (18:26 +0000)

Trivial merge