Merge branch 'release/2.6.4' into develop
Add badges to the top
Fix the release date
Merge branch 'develop'