Avatars [I'm Miron's external pusher]
Merge remote-tracking branch 'origin/master'