Puppet: Addressing more feedback from #2751
Merge pull request #2753 from daviddavis/puppet

Puppet: Addressing more feedback from #2751