From: David Schmitt <david.schmitt@puppetlabs.com>
Date: Tue, 12 Jan 2016 14:41:49 +0000 (+0000)
Subject: Merge pull request #566 from puppetlabs/4.11.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4eba9364f1bba6eab447079fcee7f6673b95fede;p=puppet-stdlib.git

Merge pull request #566 from puppetlabs/4.11.x

4.11.0 merge back
---

4eba9364f1bba6eab447079fcee7f6673b95fede