Fix #2002: Remove default avatar gallery
Merge pull request #2018 from mahagr/master

Fix #2002: Remove default avatar gallery