Merge pull request #4084 from berak:patch-2
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 3 Jun 2015 07:25:51 +0000 (07:25 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 3 Jun 2015 07:25:51 +0000 (07:25 +0000)

Trivial merge