Merge pull request #6022 from pymumu/openwrt-master