Merged -r3690:3730 from jcorgan/pager branch into trunk.