Merge pull request +11880 from c9/speed-up-flush

Make funnels more reliable

node_modules/c9/format-user-analytics.js

@@ -9,9 +9,11 @@ define(function(require, exports, module) {
 
     function formatUser(user) {
         if (!user) return {}; // empty traits get ignored
-
+        
+        var uid = /^\d+$/.test(user.id) ? user.id : user.uid;
+    
          var traits = {
-                uid: user.id,
+                uid: uid,
                 username: user.name || user.username,
                 email: user.email,
                 createdAt: user.date_add,