fix composer
Merge branch 'master' into 3.2/master
rm composer lock
Merge branch '3.2/master'