Merge branch 'master' of ssh://db.debian.org/org/db.debian.org/git/dsa-nagios