Merge Yosemite support from petesh