Fixed bad composer merges from 4.1 to 4.2
Merge pull request #4195 from GrahamCampbell/4.2-composer

Fixed bad composer merges from 4.1 to 4.2