osx: issues/1128
Merge pull request #1190 from monkeyiq/2014feb/issues/1128

osx: issues/1128