Merge remote-tracking branch 'origin/develop' into develop

netbox/ipam/filtersets.py

@@ -149,6 +149,7 @@ class AggregateFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
         try:
             prefix = str(netaddr.IPNetwork(value.strip()).cidr)
             qs_filter |= Q(prefix__net_contains_or_equals=prefix)
+            qs_filter |= Q(prefix__contains=value.strip())
         except (AddrFormatError, ValueError):
             pass
         return queryset.filter(qs_filter)
@@ -339,6 +340,7 @@ class PrefixFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
         try:
             prefix = str(netaddr.IPNetwork(value.strip()).cidr)
             qs_filter |= Q(prefix__net_contains_or_equals=prefix)
+            qs_filter |= Q(prefix__contains=value.strip())
         except (AddrFormatError, ValueError):
             pass
         return queryset.filter(qs_filter)