Rebuild r61 with CraftStudio-specific changes