Merge proposals dependent on lp://staging/~wgrant/ubufox/bug-897067

lp://staging/~wgrant/ubufox/bug-897067 has no merge proposals.