Maniac PVR
Merge branch 'PVR'