Merge pull request #827 from dp-arm/dp/pmf-constants

PMF: Fixup PMF constants