Merge proposals

userfriendly has no merge proposals.