Merge pull request #1377 from rubenk/mqtt-fix-out-of-bounds-write