Merge pull request #3521 from mfilser/master

Cards, CustomFields sorted alphabetically, fixes #3517

models/cards.js

@@ -724,9 +724,7 @@ Cards.helpers({
         definition,
       };
     });
-    if (ret.definition !== undefined) {
-      ret.sort((a, b) => a.definition.name.localeCompare(b.definition.name));
-    }
+    ret.sort((a, b) => a.definition.name !== undefined && b.definition.name !== undefined && a.definition.name.localeCompare(b.definition.name));
     return ret;
   },