Merged to 6.0.x in https://github.com/puppetlabs/puppet/commit/b2fe687915fd6335f1c202139ea445d5eca291e2
Passed 6.4.x CI in 90841f4e9f
David Schmitt can you add release notes or update if not needed.