Rebased and updated for tests added in 13838740f.
-- Justin PryzbySystem AdministratorTelsasoft+1-952-707-8581