Merge pull request #4151 from xhaggi/pvr-keymaps