Merge remote-tracking branch 'refs/remotes/origin/2.1' into rmzamora-master

Conflicts:
	composer.json