Merge pull request #273 from FreifunkUFO/master