Merge branch 'tomato-miscset' into tomato-ND-USBmod