Merge pull request #2896 from mlichvar/chrony