PR: 48319, 47470 Submitted by: Paul Marquis <pmarquis@pobox.com> , James E. Flemer <jflemer@alum.rpi.edu>