Merge branch 'gb/gitweb-avatar'