Merge pull request #271 from FreifunkUFO/master