Merge pull request #593 from puppetlabs/2.2.x