[meta] More Yosemite changes