Merge pull request #2892 from PhilLab:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 24 Jun 2014 11:52:36 +0000 (11:52 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 24 Jun 2014 11:52:37 +0000 (11:52 +0000)

Trivial merge