Merge pull request #3054 from zillatrooper:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 7 Aug 2014 06:34:31 +0000 (06:34 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 7 Aug 2014 06:34:31 +0000 (06:34 +0000)

Trivial merge