fix
Merge branch 'refs/heads/1.1.0'
Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.json