Fixed bad composer merges from 4.1 to 4.2