puppetlabs/puppet — pull request #2470 by david-caro (2014-03-25 23:30:45+00:00)
Title: Tickets/master/11263

I'm retaking this pull request as I've needed some of the options lately.