Modbus fixes merged

For those seeing Modbus problems, we have now fixes in master (thanks,
Jon!). Please try and let us know if you still see trouble.

Robin