Merge branch 'master' into development

diff --cc custom.cpp
index 699ecf2c80d1023710b2362abb573d9130227892,5476aa59c1fb1dd0b1020cd58a76264eeb1463f9..88b344775ed3c36469b833b04158884ce0373f39
--- 1/custom.cpp
--- 2/custom.cpp
+++ b/custom.cpp
@@@ -10015,15 -10445,9 +10015,12 @@@ static void check_vsyncs_fast(void
                lof_detect = 0;
                update_lof_detect();
        }
-       if (vpos == 5 && !lof_store) {
-               agnus_vsync = false;
-       }
        if (vpos == 2 && !lof_store) {
                agnus_vsync = true;
 -              lof_detect = 0;
 +              if (!beamcon0_has_vsync) {
 +                      vsync_mark();
 +              }
 +              lof_detect = 1;
                update_lof_detect();
        }
        if (vpos == 5) {