remove duplicates from merge master+delphiX-4.0.2.0