Fix msgpack on osx
Merge remote-tracking branch 'upstream/master' into osx