modify for macos 10.9.x
Merge branch 'macos-10.9.x' into v2.1.6