Please review the following patch for:

Thanks,
-- Matt