Merge XMBC master branch