Merge pull request #390 from cmurphy/puppet_27