Merge remote-tracking branch 'origin/master' into gravatar-retina

spec/helpers/application_helper_spec.rb

@@ -97,7 +97,7 @@ describe ApplicationHelper do
     it 'should call gravatar_icon when no User exists with the given email' do
       expect(helper).to receive(:gravatar_icon).with('foo@example.com', 20, 2)
 
-      helper.avatar_icon('foo@example.com', 20)
+      helper.avatar_icon('foo@example.com', 20, 2)
     end
   end