Merge pull request #9479 from alalek:issue_9477
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Aug 2017 20:10:32 +0000 (20:10 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Aug 2017 20:10:32 +0000 (20:10 +0000)

Trivial merge