Merge pull request #5269 from eladj:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 31 Aug 2015 11:09:09 +0000 (11:09 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 31 Aug 2015 11:09:09 +0000 (11:09 +0000)

Trivial merge