Merge pull request #6455 from belgraviton:bugfix_5953
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Apr 2016 12:50:45 +0000 (12:50 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Apr 2016 12:50:45 +0000 (12:50 +0000)

Trivial merge