Merge branch 'master' into scrubbing

src/tracks/ui/Scrubbing.cpp

@@ -318,10 +318,10 @@ void Scrubber::StopScrubbing()
          ControlToolBar *const ctb = mProject->GetControlToolBar();
          ctb->StopPlaying();
       }
-      return true;
+      return;
    }
    else
-      return false;
+      return;
 }
 
 bool Scrubber::IsScrubbing() const

win/audacity.iss

@@ -52,6 +52,10 @@ VersionInfoDescription={#AppName + " " + AppVersion + " Setup"}
 VersionInfoVersion={#GetFileVersion(AppExe)}
 VersionInfoCopyright={#GetFileCopyright(AppExe)}
 
+; Don't disable the "Select Destination Location" wizard, even if 
+; Audacity is already installed.
+DisableDirPage=no
+
 ; Always warn if dir exists, because we'll overwrite previous Audacity.
 DirExistsWarning=yes
 DisableProgramGroupPage=yes