Merge pull request #9388 from bkuhls/jarvis_pr9231
authorMartijn Kaijser <martijn@xbmc.org>
Sun, 27 Mar 2016 14:23:46 +0000 (16:23 +0200)
committerMartijn Kaijser <martijn@xbmc.org>
Sun, 27 Mar 2016 14:23:46 +0000 (16:23 +0200)
[Jarvis] partly backport of PR 9231 to fix segfault


Trivial merge