cherry-pick newer sockin, issue #27
Source for buildrump.sh git rev f4642ddb8707c41febb6096866e65e0d36b78c0e