(maint) Workaround travis/rubygems failures with ruby 1.8.7
Merge branch 'stable' into facter-2
Merge branch 'facter-2'