Merge branch 'master' into dev

Source commit: b38f4539a4349ccb338076b65170263711d9f735

source/windows/Setup.cpp

@@ -672,7 +672,7 @@ void __fastcall LaunchAdvancedAssociationUI()
 
   RegisterForDefaultPrograms();
   NotifyChangedAssociations();
-  // sleep recommended by http://msdn.microsoft.com/en-us/library/windows/desktop/cc144154.aspx#browser
+  // sleep recommended by https://msdn.microsoft.com/en-us/library/windows/desktop/cc144154.aspx#browser
   Sleep(1000);
 
   if (IsWin10())