Merged r11452:11459 from jcorgan/pmt-gruel into trunk. Trunk passes distcheck.