Merged r11491:11494 from jcorgan/pmt into trunk.