Merge pull request #1409 from FreifunkUFO/patch-1