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