Files from our fork of puppetlabs module
Merge pull request #1 from paulsheldrake/master

Files from our fork of puppetlabs module