Merge pull request #2984 from cambyse:2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 18 Jul 2014 10:05:22 +0000 (10:05 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 18 Jul 2014 10:05:22 +0000 (10:05 +0000)

Trivial merge