Merge pull request #3499 from StevenPuttemans:fix_2432
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 10:29:31 +0000 (10:29 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 10:29:31 +0000 (10:29 +0000)

Trivial merge