@stschulte Could you take a look at https://github.com/puppetlabs/facter/pull/389 please?  I'll merge it in now if you're +1 on it.