diff --git a/osx/installerplugins/installerplugins.xcodeproj/project.pbxproj b/osx/installerplugins/installerplugins.xcodeproj/project.pbxproj
index 731d371134..3e16fc9859 100644
--- a/osx/installerplugins/installerplugins.xcodeproj/project.pbxproj
+++ b/osx/installerplugins/installerplugins.xcodeproj/project.pbxproj
@@ -438,6 +438,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../mpkg/Plugins";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -504,6 +505,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
+				CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../mpkg/Plugins";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -521,6 +523,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COMBINE_HIDPI_IMAGES = YES;
+				CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/../mpkg/Plugins";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = managevmplugin/Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
diff --git a/osx/installerplugins/overviewplugin/overviewpluginPane.m b/osx/installerplugins/overviewplugin/overviewpluginPane.m
index 969e0f239b..519c5c997b 100644
--- a/osx/installerplugins/overviewplugin/overviewpluginPane.m
+++ b/osx/installerplugins/overviewplugin/overviewpluginPane.m
@@ -44,11 +44,15 @@
     
     BOOL enabled = self.checkbox.state == NSOnState;
     [Mixpanel trackEvent:@"Continued from Overview" forPane:self withProperties:[[NSDictionary alloc] initWithObjectsAndKeys:enabled ? @"Yes" : @"No", @"Tracking Enabled", nil]];
-    
+    NSError *error = nil;
+
     if (!enabled) {
         [[[self section] sharedDictionary] setObject:[NSNumber numberWithBool:YES] forKey:@"disableTracking"];
+        [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/.docker/machine/no-error-report", NSHomeDirectory()] error:&error];
     } else {
         [[[self section] sharedDictionary] removeObjectForKey:@"disableTracking"];
+        [[NSFileManager defaultManager] createDirectoryAtPath:[NSString stringWithFormat:@"%@/.docker/machine", NSHomeDirectory()] withIntermediateDirectories:YES attributes:nil error:&error];
+        [[NSFileManager defaultManager] createFileAtPath:[NSString stringWithFormat:@"%@/.docker/machine/no-error-report", NSHomeDirectory()] contents:[@"" dataUsingEncoding:NSUTF8StringEncoding] attributes:nil];
     }
     
 }
diff --git a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/Info.plist b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/Info.plist
index faebf1e3e7..6d6d41b201 100644
--- a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/Info.plist
+++ b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15C27e</string>
+	<string>15C50</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7B91b</string>
+	<string>7C68</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15A278</string>
+	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0710</string>
+	<string>0720</string>
 	<key>DTXcodeBuild</key>
-	<string>7B91b</string>
+	<string>7C68</string>
 	<key>Installer Version</key>
 	<string>%INSTALLER_VERSION%</string>
 	<key>InstallerSectionTitle</key>
diff --git a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin
index 51e417c09a..605480beb2 100755
Binary files a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin and b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin differ
diff --git a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/Resources/Base.lproj/managevmplugin.nib b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/Resources/Base.lproj/managevmplugin.nib
index 196ae8bff0..613ac232c2 100644
Binary files a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/Resources/Base.lproj/managevmplugin.nib and b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/Resources/Base.lproj/managevmplugin.nib differ
diff --git a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Info.plist b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Info.plist
index 96768a4ff1..973a32c57c 100644
--- a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Info.plist
+++ b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15C27e</string>
+	<string>15C50</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7B91b</string>
+	<string>7C68</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15A278</string>
+	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0710</string>
+	<string>0720</string>
 	<key>DTXcodeBuild</key>
-	<string>7B91b</string>
+	<string>7C68</string>
 	<key>Installer Version</key>
 	<string>%INSTALLER_VERSION%</string>
 	<key>InstallerSectionTitle</key>
diff --git a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/MacOS/overviewplugin b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/MacOS/overviewplugin
index 6a96bc052a..60a1a7f6ca 100755
Binary files a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/MacOS/overviewplugin and b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/MacOS/overviewplugin differ
diff --git a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Resources/Base.lproj/overviewplugin.nib b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Resources/Base.lproj/overviewplugin.nib
index 9cd4277fdf..50a1e2635e 100644
Binary files a/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Resources/Base.lproj/overviewplugin.nib and b/osx/mpkg/Plugins/overviewplugin.bundle/Contents/Resources/Base.lproj/overviewplugin.nib differ
diff --git a/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/Info.plist b/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/Info.plist
index e37b948a54..4769f833d0 100644
--- a/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/Info.plist
+++ b/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>15C27e</string>
+	<string>15C50</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -29,17 +29,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7B91b</string>
+	<string>7C68</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>15A278</string>
+	<string>15C43</string>
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0710</string>
+	<string>0720</string>
 	<key>DTXcodeBuild</key>
-	<string>7B91b</string>
+	<string>7C68</string>
 	<key>Installer Version</key>
 	<string>%INSTALLER_VERSION%</string>
 	<key>InstallerSectionTitle</key>
diff --git a/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/MacOS/quickstartplugin b/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/MacOS/quickstartplugin
index 407fff7934..3988499b9f 100755
Binary files a/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/MacOS/quickstartplugin and b/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/MacOS/quickstartplugin differ
diff --git a/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/Resources/Base.lproj/quickstartplugin.nib b/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/Resources/Base.lproj/quickstartplugin.nib
index e2d5709e7d..4e73a9fe60 100644
Binary files a/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/Resources/Base.lproj/quickstartplugin.nib and b/osx/mpkg/Plugins/quickstartplugin.bundle/Contents/Resources/Base.lproj/quickstartplugin.nib differ
diff --git a/windows/Toolbox.iss b/windows/Toolbox.iss
index ec5875ec6f..ffbc7d03c2 100644
--- a/windows/Toolbox.iss
+++ b/windows/Toolbox.iss
@@ -238,9 +238,12 @@ begin
 			if TrackingCheckBox.Checked then begin
 				TrackEventWithProperties('Continued from Overview', '"Tracking Enabled": "Yes"');
 				TrackingDisabled := False;
+				DeleteFile(ExpandConstant('{userdocs}\..\.docker\machine\no-error-report'));
 			end else begin
 				TrackEventWithProperties('Continued from Overview', '"Tracking Enabled": "No"');
 				TrackingDisabled := True;
+				CreateDir(ExpandConstant('{userdocs}\..\.docker\machine'));
+				SaveStringToFile(ExpandConstant('{userdocs}\..\.docker\machine\no-error-report'), '', False);
 			end;
   end;
   Result := True