Yosemite fix
Merge branch 'yosemite_fix'