merge upstream
Merge branch 'master' of github.com:tobru/puppet-puppet