Merge pull request #3308 from edgarriba:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 11 Oct 2014 17:33:28 +0000 (17:33 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 11 Oct 2014 17:33:28 +0000 (17:33 +0000)

Trivial merge