Merge pull request #5142 from StevenPuttemans:fix_4230
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 25 Aug 2015 07:39:02 +0000 (07:39 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 25 Aug 2015 07:39:02 +0000 (07:39 +0000)

Trivial merge