Merge pull request #15935 from vdemeester/badges-all-the-things

Add more badges :)