Merge pull request #417 from bluewavenet/openwrt-18.06