Merge pull request #1881 from Montellese/win32_xbmc_pvr_addons