https://angela.zipwhip.com/issues/14756 Trim down the json that is sent to the client (DeliveredMessage)
Merge remote-tracking branch 'origin/master'