Merge proposals dependent on lp://qastaging/~benji/vte/fixes

lp://qastaging/~benji/vte/fixes has no merge proposals.