Oops. Fixing something I've messed up a month ago.
Merge branch 'avatar-fixes' into deployment