Update badges.
Improved badges
Merge pull request #2885 from GrahamCampbell/badges

[4.1] Improved Badges
Merge remote-tracking branch 'upstream/master'