Merge pull request #179 from gsomlo/gls-xtra-addrlen