Updates from nmap 6.40