Merge proposals

xfishtank in Ubuntu has no merge proposals.