Fixes #1867
Conflicts:
	companion/src/modeledit/logicalswitches.cpp