Handle Darwin.x86_64 as uname for darwin
Merge branch 'fixes'