Apparently I forgot to run all the tests before posting v4. Here is a newversion of the patch that should pass all tests.
-- Nathan BossartAmazon Web Services: https://aws.amazon.com