fix build on mac os x
Merge commit '39bc4e1'