Patches for NTP Time Offset [sf#2864922] [#1013]