Merge proposals dependent on lp://staging/mahara-lang/21.04

lp://staging/mahara-lang/21.04 has no merge proposals.