Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/jschlag/nitsi