Merge pull request #994 from sipa/deladdr