Merge pull request #5230 from PhilLab:patch-4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 8 Dec 2015 18:46:33 +0000 (18:46 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 8 Dec 2015 18:46:34 +0000 (18:46 +0000)

Trivial merge