Merge upstream changes from freifunk/openwrt