Merge branch 'master' of github.com:cargomedia/puppet-packages into issue-47