Merge proposals

mapeditor.org has no merge proposals.