Link editorial brand titles (bug 1048515)

Upstreamed from Fireplace, including some fixes unrelated to this bug (f563e8e6c54d43c70c52937c7e95ad3a7e8c699d).