Merge pull request #2788 from dibdot/opkg