Merged to 5.5.x in https://github.com/puppetlabs/puppet/commit/bb1a4cc6a0931957225055bdadb4651266e09d81