Adding patch for OSX from Tor Andre Myrvoll (thanks!)
Adding patch for OSX from Tor Andre Myrvoll (thanks!)
Merge commit '403b6e4'