Merge remote-tracking branch 'origin/2.1' into 2.2

Conflicts:
	composer.json
License file moved to meta folder
Merge pull request #60 from peterkokot/patch-1

License file moved to meta folder
Merge branch '2.2' into 2.3