Merge pull request #965 from puppetlabs/RE-13436