Merge pull request #4287 from xwxtwd/master

Use allowed instead of whitelisted; Use disallowed instead of blacklisted;

test/vendor/underscore.js

@@ -1019,7 +1019,7 @@
     }
   };
 
-  // Return a copy of the object only containing the whitelisted properties.
+  // Return a copy of the object only containing the allowed properties.
   _.pick = function(object, oiteratee, context) {
     var result = {}, obj = object, iteratee, keys;
     if (obj == null) return result;
@@ -1039,7 +1039,7 @@
     return result;
   };
 
-   // Return a copy of the object without the blacklisted properties.
+   // Return a copy of the object without the disallowed properties.
   _.omit = function(obj, iteratee, context) {
     if (_.isFunction(iteratee)) {
       iteratee = _.negate(iteratee);
@@ -1545,4 +1545,4 @@
       return _;
     });
   }
-}.call(this));
+}.call(this));