Merge pull request #3500 from StevenPuttemans:fix_2432_2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 10:28:33 +0000 (10:28 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 10:28:33 +0000 (10:28 +0000)

Trivial merge