Merge "Fix an ntohs/htons issue."