Merge pull request #2134 from jbesraa/add_fromstr_to_netaddress