Merged into master with https://github.com/puppetlabs/puppet/commit/332179b5526126fb89bdf77492be5bf3c4e643ec
Passed CI in 332179b552