Merge pull request #358 from freifunk-leipzig/master