Merge pull request #7016 from lewgate:bugfix_2
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 8 Aug 2016 15:20:10 +0000 (15:20 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 8 Aug 2016 15:20:11 +0000 (15:20 +0000)

Trivial merge