Merged into master with https://github.com/puppetlabs/puppet/commit/c38342f7063cf2c0b4ed9b1c1da7c1486d446c86
Passed CI in https://github.com/puppetlabs/puppet/commit/cdd4bddef009d34091b2bebc4b49c342cb4b333d