Merge xbmc master branch