Merge pull request #2425 from cshoredaniel/pr-fix-ipaddrport-js