Still fighting with git
Merge branch 'master_compilable' of https://github.com/dvh61/xbmc-pvr-addons