Can you cherry-pick
https://github.com/popcornmix/xbmc/commit/b945a0ef6269427d8ad3f675041e951f1c10ab5d
if it looks okay.