Merge XBMC master bransch