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