Pulling in latest master

This is just a PR that pulls the latest changes from master into visual-studio, most notable badge categories.