Merge remote-tracking branch 'origin/master' into upstream

Change-Id: I15afea81fafe0ff41f2cfec4d9d89e0059367af6

Author: Stewart Miles

source/VersionHandlerImpl/src/ProjectSettings.cs

@@ -406,6 +406,15 @@ private static void Save() {
                     return;
                 }
                 Directory.CreateDirectory(Path.GetDirectoryName(PROJECT_SETTINGS_FILE));
+                if (UnityEditor.VersionControl.Provider.enabled && UnityEditor.VersionControl.Provider.isActive &&
+                    (!UnityEditor.VersionControl.Provider.requiresNetwork ||
+                     UnityEditor.VersionControl.Provider.onlineState == UnityEditor.VersionControl.OnlineState.Online)) {
+                    var task = UnityEditor.VersionControl.Provider.Checkout(PROJECT_SETTINGS_FILE, 
+                                                                        UnityEditor.VersionControl.CheckoutMode.Exact);
+                    task.Wait();
+                    if (!task.success)
+                        return;
+                }
                 using (var writer = new XmlTextWriter(new StreamWriter(PROJECT_SETTINGS_FILE)) {
                         Formatting = Formatting.Indented,
                     }) {