Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet
authorroot <root@handel.debian.org>
Sat, 18 Mar 2017 19:16:35 +0000 (19:16 +0000)
committerroot <root@handel.debian.org>
Sat, 18 Mar 2017 19:16:35 +0000 (19:16 +0000)

Trivial merge