Merged to master in https://github.com/puppetlabs/puppet/commit/edb182bfe69b56ebfc8a6406ef8f026a5c6322aa
Merged to master in https://github.com/puppetlabs/puppet/commit/88da3734d0d89aa64272bb53a83a4edac1dd0b46