Merge pull request #576 from puppetlabs/2.2.x