support osx
support osx
Merge commit 'c646caa12046a6c3304d6cef9a61079029653ca9' into osx-support