Fixes #1852
Conflicts:
	companion/src/firmwares/opentx/opentxeeprom.cpp
	companion/src/modeledit/customfunctions.cpp