Sync with main branch r6516

eeschema/class_libentry.cpp

@@ -1754,16 +1754,16 @@ void LIB_PART::SetAliases( const wxArrayString& aAliasList )
     }
 
     // Remove names in the current component that are not in the new alias list.
-    LIB_ALIASES::iterator it;
+    LIB_ALIASES::iterator it = m_aliases.begin();
 
-    for( it = m_aliases.begin(); it != m_aliases.end(); it++ )
+    while( it != m_aliases.end() )
     {
         int index = aAliasList.Index( (*it)->GetName(), false );
 
         if( index != wxNOT_FOUND || (*it)->IsRoot() )
-            continue;
-
-        it = m_aliases.erase( it );
+            ++it;
+        else
+            it = m_aliases.erase( it );
     }
 }
 

pcbnew/drc.cpp

@@ -955,6 +955,13 @@ bool DRC::doPadToPadsDrc( D_PAD* aRefPad, D_PAD** aStart, D_PAD** aEnd, int x_li
             if( pad->PadNameEqual( aRefPad ) )
                 continue;
         }
+        
+        // if either pad has no drill and is only on technical layers, not a clearance violation
+        if( ( ( pad->GetLayerSet() & layerMask ) == 0 && !pad->GetDrillSize().x ) ||
+            ( ( aRefPad->GetLayerSet() & layerMask ) == 0 && !aRefPad->GetDrillSize().x ) )
+        {
+            continue;
+        }
 
         if( !checkClearancePadToPad( aRefPad, pad ) )
         {