Fix composer syntax
Merge branch 'master' into 2.3