add ip addresses to localnames
Merge branch 'master' into portable