use libc++ for non-c++11 branches on mac os x
Merge branch 'master' into batched_send