Merge pull request #3801 from ey6es/master

Default avatar fixes.