Merge pull request #2757 from FernetMenta/pvrstream