Merge proposals dependent on lp://qastaging/sfml

lp://qastaging/sfml has no merge proposals.