puppetlabs/puppet — pull request #662 by jeffweiss (2012-04-11 23:12:45+00:00)
Title: (#13894) backport fix of #12191

cherrypick commit already merged into master to backport into 2.7.x