Badges fixes
Merge branch 'spress-core'