Add missing support for msgpack and json in batched mode using websockets
Merge remote-tracking branch 'upstream/master'