This merge may be extremely painful because I made a lot of changes in the codebase to thousands of its files (the biggest being epic debranding / removal of hard-coded Composr / URLs and using what we should be using [get_brand_url, brand_name, etc]).

I have retagged to "over the horizon", as this clearly isn't happening soon.