Update composer.json
Merge branch 'hotfix/1.2.5'