Merge pull request #15628 from kkirsche/patch-1

[Fix Issue #15561] Fix badges not being resized inside .btn-group-xs if .btn-xs is not applied

less/badges.less

@@ -29,7 +29,8 @@
     top: -1px;
   }
 
-  .btn-xs & {
+  .btn-xs &,
+  .btn-group-xs > .btn & {
     top: 0;
     padding: 1px 5px;
   }