Rebase xbmc:master

Rebase from latest head on xbmc master