Merge r98679 from the pageoutput branch into trunk.