Merge pull request #10544 from alalek:issue_10535
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 9 Jan 2018 15:32:42 +0000 (15:32 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 9 Jan 2018 15:32:42 +0000 (15:32 +0000)

Trivial merge