! Static definitions can only be defined once

Signed-off-by: John Rayes <live627@gmail.com>
! Avatar uploads weren't shown (fixes #1951)
+ Gravatar settings went missing

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #1965 from live627/release-2.1s

A few random fixes