Merge pull request #691 from kaysoky/UnsentMessageFix

Fix for UnsentMessageQueuer
Merge branch 'release-14' into develop