Including PR

https://github.com/xbmc/xbmc/pull/2597.diff