Merge pull request #11531 from alalek:issue_11518
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 18 May 2018 10:59:27 +0000 (10:59 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 18 May 2018 10:59:27 +0000 (10:59 +0000)

Trivial merge