Merge pull request #1110 from puppetlabs/CONT-581