Merge xbmc-pvr-addons master branch