Backport of Gravatar library update from CI3 development