@Donncha: Thanks, I’ll look into that option for the long term. With the staging area and version control, it only costs us an extra minute or so to make the current setup work when upgrading WordPress MU, so it’s not a huge problem yet.