Merge branch 'ff/ntpd'