Merge proposals dependent on lp://staging/mahara-manual/1.7

lp://staging/mahara-manual/1.7 has no merge proposals.