Merge pull request #2740 from daviddavis/puppet-merge

Merging in master into puppet