Merge proposals

kh_citizen has no merge proposals.