Merge branch 'master' into actor-context

Author: jdantonio

spec/concurrent/thread_pool_shared.rb

@@ -169,7 +169,8 @@
     end
 
     it 'kills all threads' do
-      unless jruby?
+      unless jruby? # this check is incorrect, want to check for class
+        pending('brittle test--counting threads is not reliable')
         before_thread_count = Thread.list.size
         100.times { subject << proc{ sleep(1) } }
         sleep(0.1)