Revert composer.json changes
Merge remote-tracking branch 'remotes/dev/1.4' into 1.4