Fix merging of composers.
Merge branch '4.2'