Merge pull request #2124 from commodo/ntpd-build-fix