Manually merge remote-tracking branch 'upstream/master' into HEAD

Conflicts:
	include/swift/AST/PrettyStackTrace.h

lib/Serialization/Serialization.cpp

@@ -3439,6 +3439,7 @@ public:
                            rawAccessLevel,
                            fn->needsNewVTableEntry(),
                            S.addDeclRef(fn->getOpaqueResultTypeDecl()),
+                           fn->isUserAccessible(),
                            nameComponentsAndDependencies);
 
     writeGenericParams(fn->getGenericParams());