Merge pull request #142 from angular/master

Update upstream

Author: GulajavaMinistudio

karma-shared.conf.js

@@ -107,12 +107,14 @@ module.exports = function(config, specificOptions) {
       'SL_iOS_10': {
         base: 'SauceLabs',
         browserName: 'iphone',
+        platform: 'OS X 10.12',
         version: '10.3'
       },
       'SL_iOS_11': {
         base: 'SauceLabs',
         browserName: 'iphone',
-        version: '11'
+        platform: 'OS X 10.12',
+        version: '11.3'
       },
 
       'BS_Chrome': {

src/ng/directive/ngModelOptions.js

@@ -41,7 +41,7 @@ ModelOptions.prototype = {
     options = extend({}, options);
 
     // Inherit options from the parent if specified by the value `"$inherit"`
-    forEach(options, /* @this */ function(option, key) {
+    forEach(options, /** @this */ function(option, key) {
       if (option === '$inherit') {
         if (key === '*') {
           inheritAll = true;