Merge pull request #9592 from alalek:issue_9589
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 Sep 2017 14:57:49 +0000 (14:57 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 Sep 2017 14:57:49 +0000 (14:57 +0000)

Trivial merge