WARNING: Preparing to merge ben-mule-21-5
Will merge as soon as I'm finished testing, perhaps in a few hours.
Use the tag pre-ben-mule-21-5-merge-in if you don't want to deal with the new
code. Otherwise, be warned that there will likely be some instability for a few
days.
ben