CS fixes
Merge remote-tracking branch 'origin/1.0'

Conflicts:
	tests/Functional/MiddlewareTest.php