I put together a rebased version of the patch for cfbot.
-- Nathan BossartAmazon Web Services: https://aws.amazon.com