CS fixes
Merge remote-tracking branch 'origin/2.0' into 2.1

Conflicts:
	tests/DefinitionTest.php
	tests/EloquentTest.php
CS fixes