Merge pull request #3953 from sunnyqeen/openwrt-18.06