Merge pull request #6007 from aparcar/export-openwrt