Conflicts:
	extensions/ModbusMaster/MBExchange.cc
	extensions/ModbusSlave/MBSlave.cc
	extensions/include/IOBase.h
	extensions/lib/IOBase.cc