Merge proposals

D-bugzilla-7 has no merge proposals.