bb11167 - code improvement of possible buffer overflow through sprintf().
Merge branch '0.98.5' into always-on-json-0.98.5