Fix avatar classes
Merge pull request #966 from roots/avatar_fix

Fix avatar classes
Merge remote-tracking branch 'upstream/master'