Merge upstream changes from freifunk/packages