Use fancy new badges
Merge branch 'release-3.6.x'

Conflicts:
	README.md