Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

stdlib/public/SDK/Foundation/Foundation.swift

@@ -931,7 +931,7 @@ extension NSDictionary : Sequence {
         // Deliberately avoid the subscript operator in case the dictionary
         // contains non-copyable keys. This is rare since NSMutableDictionary
         // requires them, but we don't want to paint ourselves into a corner.
-        return (key: key, value: _dictionary.object(forKey: key)!)
+        return (key: key, value: _dictionary.object(for: key)!)
       }
     }
 
@@ -1316,7 +1316,7 @@ extension NSCoder {
           unsafeBitCast($0, to: NSObject.self)
         })
     }
-    return self.__decodeObject(ofClasses: classesAsNSObjects, forKey: key)
+    return self.__decodeObjectOf(classes: classesAsNSObjects, forKey: key)
   }
 
   @warn_unused_result