Merge pull request #9044 from annando/avatar-stuff