merge to openwrt-trunk r42868