Merge remote-tracking branch 'origin/master' into is-6

# Conflicts:
#	Projects/Compile.pas

Projects/Main.pas

@@ -146,7 +146,7 @@ var
   WizardComponents, WizardDeselectedComponents, WizardTasks, WizardDeselectedTasks: TStringList;
   NeedToAbortInstall: Boolean;
 
-  { Check/BeforeInstall/AfterInstall 'contants' }
+  { Check/BeforeInstall/AfterInstall 'constants' }
   CheckOrInstallCurrentFilename, CheckOrInstallCurrentSourceFilename: String;
 
   { RestartManager API state.