Squashed 'bundle/chat/' content from commit fd4dbef

git-subtree-dir: bundle/chat
git-subtree-split: fd4dbef3e76f99456a0a976b00d781573253786d
Merge commit '39d6577bb12489e86e511c3665af6ad1ce34cb28' as 'bundle/chat'