Merge pull request #2670 from antvick/feature/modbus_64bit