Merge proposals

xfconf has no merge proposals.