improves stun messages
Merge pull request #5890 from Jordie0608/iwhoopsedalloverit

Fixes #5840 Improves stun baton messages