Merged to master in https://github.com/puppetlabs/puppet/commit/4f5ce8f67a3effd99691fe0bf91625bb9aed544c