Merge commit 'flameeyes/osx'