Merge pull request #1008 from gavinandresen/addrworkaround