Code

Merge changes from branches/dermoth_ntp_rework (check_ntp_peer/check_ntp_time)