Improved badges
Merge pull request #2885 from GrahamCampbell/badges

[4.1] Improved Badges
Updated badges
Merge pull request #2935 from GrahamCampbell/badges

Updated Badges
Merge branch 'master' into develop