Merged Mario's modbus branch. Fixed line endings.

2018-01-30, Edouard Tisserant