Merge rednet changes into 1.6