Set msg.data for non-JSON messages.
Merge remote-tracking branch 'origin/master'