Merged into. master with https://github.com/puppetlabs/puppet/commit/a63cedac98299cf1d5431e6c04cae3ac352b5db1
Passed CI in 4092d14208bbcb1bba7969266813f0ac6a46185a