Merge pull request #5266 from dermoth/libndp