'origin/dvogonen/move_firmware_selection_settings_988' into bsongis/refactoring_firmware_interface Conflicts: companion/src/apppreferencesdialog.cpp companion/src/apppreferencesdialog.h
'origin/dvogonen/move_firmware_selection_settings_988' into bsongis/refactoring_firmware_interface Conflicts: companion/src/apppreferencesdialog.cpp companion/src/apppreferencesdialog.h