Merge branch 'origin/master'
updated composer.json
Merge branch 'origin/2.2'