Merge stjr/next
Not 100% sure if the change made to p_maps.c in a5e58c1c / "Small changes for parity with next" is relevant to rphys; please check.
Not 100% sure if the change made to p_maps.c in a5e58c1c / "Small changes for parity with next" is relevant to rphys; please check.