Merge 'master' into gravatar
Adding gravatar image to the follow page