attempting to add a fix for darwin
Merge remote-tracking branch 'origin/master'
threaded malarkey doesn't work...