Merge pull request #5674 from mshabunin:mac-fix-2.4
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 17 Nov 2015 17:30:07 +0000 (17:30 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 17 Nov 2015 17:30:08 +0000 (17:30 +0000)

Trivial merge