Merge pull request #5956 from arunagw/mocha_upgrade

Upgrading to Mocha 0.11.2 to fix Object#method override

Gemfile

@@ -29,7 +29,7 @@ end
 gem 'uglifier', '>= 1.0.3', :require => false
 
 gem 'rake', '>= 0.8.7'
-gem 'mocha', '>= 0.9.8'
+gem 'mocha', '>= 0.11.2'
 
 group :doc do
   # The current sdoc cannot generate GitHub links due