Merged r10463:10658 from jblum/gui_guts into trunk. Trunk passes distcheck.