Merge XBMC master branch