Merge XBMC master