Merge pull request #914 from openwrt-es/for-14.07-next