OSX build fix
merged heads