Merge pull request #3154 from PhilLab:patch-4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Aug 2014 18:09:27 +0000 (18:09 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Aug 2014 18:09:27 +0000 (18:09 +0000)

Trivial merge