Merge pull request #3226 from whoshuu:patch-1
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 17 Sep 2014 09:52:01 +0000 (09:52 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 17 Sep 2014 09:52:01 +0000 (09:52 +0000)

Trivial merge