Merge pull request #3196 from PhilLab:patch-4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 10 Sep 2014 07:56:13 +0000 (07:56 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 10 Sep 2014 07:56:13 +0000 (07:56 +0000)

Trivial merge