Merge branch 'master' of ssh://github.com/86Box/86Box into version/4.1

# Conflicts:
#	CMakeLists.txt
#	debian/changelog
#	src/include_make/86box/version.h
#	src/unix/assets/86Box.spec
#	src/unix/assets/net.86box.86Box.metainfo.xml
#	vcpkg.json

src/machine/machine_table.c

@@ -1045,7 +1045,7 @@ const machine_t machines[] = {
         .ram = {
             .min = 256,
             .max = 640,
-            .step = 256
+            .step = 128
         },
         .nvrmask = 0,
         .kbc_device = &keyboard_xtclone_device,
@@ -1472,7 +1472,7 @@ const machine_t machines[] = {
         .bus_flags = MACHINE_PC,
         .flags = MACHINE_VIDEO_FIXED,
         .ram = {
-            .min = 256,
+            .min = 384,
             .max = 640,
             .step = 128
         },