Merged r4767:4859 from developer branch jcorgan/channel, passes distcheck.