Merge pull request #3153 from PhilLab:patch-3
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Aug 2014 11:29:42 +0000 (11:29 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 25 Aug 2014 11:29:42 +0000 (11:29 +0000)

Trivial merge