Merge remote-tracking branch 'refs/remotes/origin/2.1' into rmzamora-master
Merge remote-tracking branch 'refs/remotes/origin/rmzamora-master'
Merge remote-tracking branch 'refs/remotes/origin/2.1'
updated composer.json
updated composer.json