Merge pull request #2464 from openwrt-es/bluez-next