Fix change log
Fix CSS syntax errors
Merge branch 'master' into css-registry

Conflicts:
	docs/CHANGES.rst