Changes to facter-ng: https://github.com/puppetlabs/facter-ng/pull/269
Changes to puppet: https://github.com/mihaibuzgau/puppet/commit/7e72a87e76d65b6c869b345fc5b9e82e248521ec