Merged wip r11012:11022 from jcorgan/deb into trunk.