Merge pull request #9600 from StevenPuttemans:fix_9583
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 Sep 2017 13:27:04 +0000 (13:27 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 13 Sep 2017 13:27:04 +0000 (13:27 +0000)

Trivial merge