(cherry picked from commit ba67f39db6) # Conflicts: # .github/workflows/ci-build.yml # CMakeLists.txt # COMPILING.md # src/os/macosx/survey_osx.cpp # src/os/windows/survey_win.cpp # src/script/api/script_admin.cpp # src/script/api/script_event_types.cpp # src/tests/test_script_admin.cpp
ba67f39db6