Fix formatting in changes.
Merge branch 'master' into consistent_setup_and_teardown_behavior

Conflicts:
	CHANGES.md