Merge pull request #281 from puppetlabs/1.3.x
authorJT (Jonny) <jonathan.tripathy@puppetlabs.com>
Tue, 8 Dec 2015 15:36:37 +0000 (15:36 +0000)
committerJT (Jonny) <jonathan.tripathy@puppetlabs.com>
Tue, 8 Dec 2015 15:36:37 +0000 (15:36 +0000)
1.3.x mergeback


Trivial merge