Merge branch 'facter-2' into stable
Merge branch 'stable' into facter-2