Merge davem@outer-richmond.davemloft.net:src/GIT/net-2.6/