Merge pull request #3514 from mshabunin:compat-24
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 10:38:55 +0000 (10:38 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 10:38:56 +0000 (10:38 +0000)

Trivial merge