Merge pull request #1783 from matwey/ntp