Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x