diff --git a/lodash.js b/lodash.js
index 7e9d44c97..ee7535c4c 100644
--- a/lodash.js
+++ b/lodash.js
@@ -2407,7 +2407,16 @@
       var objValue = object[key];
       if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) ||
           (value === undefined && !(key in object))) {
-        object[key] = value;
+        if (key == '__proto__' && defineProperty) {
+          defineProperty(object, key, {
+            'configurable': true,
+            'enumerable': true,
+            'value': value,
+            'writable': true
+          });
+        } else {
+          object[key] = value;
+        }
       }
     }
 
@@ -8746,7 +8755,7 @@
      * // => { '3': 2, '5': 1 }
      */
     var countBy = createAggregator(function(result, value, key) {
-      hasOwnProperty.call(result, key) ? ++result[key] : (result[key] = 1);
+      hasOwnProperty.call(result, key) ? ++result[key] : assignValue(result, key, 1);
     });
 
     /**
@@ -9069,7 +9078,7 @@
       if (hasOwnProperty.call(result, key)) {
         result[key].push(value);
       } else {
-        result[key] = [value];
+        assignValue(result, key, [value]);
       }
     });
 
@@ -9182,7 +9191,7 @@
      * // => { 'left': { 'dir': 'left', 'code': 97 }, 'right': { 'dir': 'right', 'code': 100 } }
      */
     var keyBy = createAggregator(function(result, value, key) {
-      result[key] = value;
+      assignValue(result, key, value);
     });
 
     /**
diff --git a/test/test.js b/test/test.js
index 0004759f1..323d81db4 100644
--- a/test/test.js
+++ b/test/test.js
@@ -7461,7 +7461,7 @@
   QUnit.module('`__proto__` property bugs');
 
   (function() {
-    QUnit.test('internal data objects should work with the `__proto__` key', function(assert) {
+    QUnit.test('should work with the `__proto__` key in internal data objects', function(assert) {
       assert.expect(4);
 
       var stringLiteral = '__proto__',
@@ -7477,6 +7477,13 @@
       assert.deepEqual(_.uniq(largeArray), expected);
       assert.deepEqual(_.without.apply(_, [largeArray].concat(largeArray)), []);
     });
+
+    QUnit.test('should treat `__proto__` as a regular key in assignments', function(assert) {
+      assert.expect(1);
+
+      var actual = _.groupBy([{ 'a': '__proto__' }], 'a');
+      assert.notOk(actual instanceof Array);
+    });
   }());
 
   /*--------------------------------------------------------------------------*/