CS fix
Merge remote-tracking branch 'origin/2.1'

Conflicts:
	tests/Functional/FilterEnabledTest.php