Merge pull request #4167 from berak:patch-2
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 1 Jul 2015 17:29:24 +0000 (17:29 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 1 Jul 2015 17:29:24 +0000 (17:29 +0000)

Trivial merge