Merge remote-tracking branch 'remotes/fmarier/libravatar-in-comments'