Merged r10539:10546 from michaelld/two_mods into trunk. Trunk passes distcheck.