Merging changes from msgpack-c @f07950c60a