Merge branch '3.x'

Author: nebhale

spec/bin/detect_spec.rb

@@ -24,7 +24,7 @@
 
     run("bin/detect #{app_dir}") do |status|
       expect(status).to be_success
-      expect(stdout.string.rstrip.length).to be < 255
+      expect(stdout.string.rstrip.length).to be <= 255
     end
   end