Merge pull request #33 from openwrt/revert-29-master