Merge branch 'develop' into feature

netbox/users/admin.py

@@ -89,6 +89,7 @@ class UserAdmin(UserAdmin_):
         ('Important dates', {'fields': ('last_login', 'date_joined')}),
     )
     filter_horizontal = ('groups',)
+    list_filter = ('is_active', 'is_staff', 'is_superuser', 'groups__name')
 
     def get_inlines(self, request, obj):
         if obj is not None: