Auto-Merge pull request #2942 from rubenk/ntpd-plug-leak