Sync with xbianonpi/xbmc-nightly@d7210b02f4001c4e466014bcdd0c523f59206289