Fixed focus-follows-mouse on OSX
Merge remote-tracking branch 'origin/master'