Merge remote-tracking branch 'opdenkamp/master'
Merge branch 'master' of https://github.com/margro/xbmc-pvr-addons