Merge proposals dependent on lp://staging/~deejay1/groundcontrol/typo-fixes

lp://staging/~deejay1/groundcontrol/typo-fixes has no merge proposals.