ntp 4.2.8p9. Approved by: so
Thanks to roberto for providing pointers to wedge this into HEAD. Approved by: roberto