Merge pull request #3007 from kobigurk:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Jul 2014 11:12:14 +0000 (11:12 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 28 Jul 2014 11:12:14 +0000 (11:12 +0000)

Trivial merge