Catch up to xbmc branch sep 27

After some testing I believe it is okey to merge the xbmc changes. But will not merge it straight away so you guys can give your own two cents.