Merge pull request #407 from bluewavenet/openwrt-18.06