Pull new upstream changes

based on freifunk-gluon/packages@48b26ad13e03ddb7d6e6f25424597f38648f8217