Merge pull request #292 from daenney/test-puppet-35