CLC-2144 Refresh badges too
Merge pull request #1251 from ctweney/clc-2144

CLC-2144 Refresh badges too