Merge tag '1.1' into develop

Version 1.1
Bump branch aliases.
Fix syntax error in composer.json.
Merge branch 'master' into develop

Conflicts:
	composer.json
Merge branch 'release/1.2'