update to head of osx_1.9 branch