Merge remote-tracking branch 'remotes/bmx6-owrt/master' into openwrt-bmx6