Merge pull request #9404 from Memphiz/fix_json_stack_overflowbp
authorjenkins4kodi <jenkins4kodi@users.noreply.github.com>
Tue, 22 Mar 2016 17:42:06 +0000 (18:42 +0100)
committerjenkins4kodi <jenkins4kodi@users.noreply.github.com>
Tue, 22 Mar 2016 17:42:06 +0000 (18:42 +0100)

Trivial merge