Merge pull request #3158 from arielelkin:master
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 26 Aug 2014 16:07:10 +0000 (16:07 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 26 Aug 2014 16:07:10 +0000 (16:07 +0000)

Trivial merge