Added pvr-mark-permanent description. (Bug 39857)
Merge branch 'release-2.4.1' into release-3.0.0
Merge branch 'release-3.0.0' into release-3.2.0