Merge proposals dependent on lp://staging/~fiach-antaw/footnote/footnote-fix

lp://staging/~fiach-antaw/footnote/footnote-fix has no merge proposals.