Merge branch 'master' into fixes_3_16_0

Author: HenriWahl

build/windows/nagstamon.iss

@@ -23,7 +23,7 @@ Compression=lzma
 SolidCompression=true
 SourceDir={#source}
 ArchitecturesAllowed={#archs_allowed}
-ArchitecturesInstallIn64BitMode=x64
+ArchitecturesInstallIn64BitMode=x64compatible
 CloseApplications=no
 WizardStyle=modern
 [Icons]