Merged r5950:5978 from features/pager into trunk. Trunk passes distcheck.