Merge branch 'master' into perf/unnecessary-merges

Gemfile.lock

@@ -90,7 +90,7 @@ GEM
       rake
     multi_json (1.11.2)
     netrc (0.10.3)
-    newrelic_rpm (3.15.0.314)
+    newrelic_rpm (3.16.0.318)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)

presenters/thread_utils.rb

+require 'new_relic/agent/method_tracer'
+
 module ThreadUtils
 
   def self.get_endorsed(threads)
@@ -39,9 +41,10 @@ module ThreadUtils
     read_states
   end
 
-  extend self
+  class << self
     include ::NewRelic::Agent::MethodTracer
     add_method_tracer :get_read_states
     add_method_tracer :get_endorsed
+  end
 
 end