Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...